From 17bd363de3d07242c334f0299d8e321a25d81e5b Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Mon, 23 Sep 2019 11:39:49 +0100 Subject: [PATCH] no-openssl don't add -lssl etc if not needed (because we use system-postgresql) Gbp-Pq: Name no-openssl.diff --- RepositoryExternal.mk | 72 +------------------ config_host.mk.in | 4 -- configure.ac | Bin 467426 -> 464875 bytes connectivity/Library_postgresql-sdbc-impl.mk | 1 - external/Module_external.mk | 1 - oox/CppunitTest_oox_tokenmap.mk | 9 --- oox/Library_oox.mk | 9 --- ucb/CppunitTest_ucb_webdav_local_neon.mk | 1 - ucb/CppunitTest_ucb_webdav_neon_opts.mk | 1 - ucb/CppunitTest_ucb_webdav_propfindcache.mk | 1 - ucb/CppunitTest_ucb_webdav_res_access.mk | 1 - ucb/Library_ucpdav1.mk | 2 - 12 files changed, 2 insertions(+), 100 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a92d6f39155..02c9a83435d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1517,75 +1517,6 @@ endef endif # SYSTEM_HARFBUZZ -ifeq ($(DISABLE_OPENSSL),TRUE) - -gb_ExternalProject__use_openssl:= -gb_LinkTarget__use_openssl_headers:= -gb_LinkTarget__use_openssl:= - -else # !DISABLE_OPENSSL - -ifneq ($(SYSTEM_OPENSSL),) - -gb_LinkTarget__use_openssl_headers:= -gb_ExternalProject__use_openssl:= - -define gb_LinkTarget__use_openssl -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(OPENSSL_CFLAGS) \ -) -$(call gb_LinkTarget_add_libs,$(1),$(OPENSSL_LIBS)) - -endef - -else # !SYSTEM_OPENSSL - -$(eval $(call gb_Helper_register_packages_for_install,ooo, \ - openssl \ -)) - -define gb_ExternalProject__use_openssl -$(call gb_ExternalProject_use_package,$(1),openssl) - -endef - -define gb_LinkTarget__use_openssl_headers -$(call gb_LinkTarget_use_external_project,$(1),openssl) -$(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,openssl)/include \ - $$(INCLUDE) \ -) - -endef - -define gb_LinkTarget__use_openssl -$(call gb_LinkTarget_use_package,$(1),openssl) -ifeq ($(OS),WNT) -$(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,openssl)/out32dll/ssleay32.lib \ - $(call gb_UnpackedTarball_get_dir,openssl)/out32dll/libeay32.lib \ -) -else -$(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,openssl)/libssl.a \ - $(call gb_UnpackedTarball_get_dir,openssl)/libcrypto.a \ -) -$(call gb_LinkTarget_use_external_project,$(1),openssl) -ifeq ($(OS),SOLARIS) -$(call gb_LinkTarget_add_libs,$(1),\ - -lnsl \ - -lsocket \ -) -endif -endif - -endef - -endif # SYSTEM_OPENSSL -endif # DISABLE_OPENSSL - - ifeq ($(DISABLE_OPENSSL),TRUE) define gb_LinkTarget__use_gnutls @@ -3069,9 +3000,10 @@ $(call gb_LinkTarget_add_libs,$(1),\ $(call gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT) \ ) -ifeq ($(OS),WNT) $(call gb_LinkTarget_use_external,$(1),openssl) +ifeq ($(OS),WNT) + $(call gb_LinkTarget_use_system_win32_libs,$(1),\ secur32 \ ws2_32 \ diff --git a/config_host.mk.in b/config_host.mk.in index 484fed98e73..e4b937f0976 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -107,7 +107,6 @@ export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@ export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@ export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@ export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@ -export DISABLE_OPENSSL=@DISABLE_OPENSSL@ export DISABLE_PYTHON=@DISABLE_PYTHON@ export DLOPEN_LIBS=@DLOPEN_LIBS@ export DLLTOOL=@DLLTOOL@ @@ -434,8 +433,6 @@ export OFFICEOTRON=@OFFICEOTRON@ export BFFVALIDATOR=@BFFVALIDATOR@ export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@ export OOO_VENDOR=@OOO_VENDOR@ -export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@ -export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@ export OPENSYMBOL_TTF=@OPENSYMBOL_TTF@ export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@ export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@ @@ -572,7 +569,6 @@ export SYSTEM_NSS=@SYSTEM_NSS@ export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@ export SYSTEM_ODFGEN=@SYSTEM_ODFGEN@ export SYSTEM_OPENLDAP=@SYSTEM_OPENLDAP@ -export SYSTEM_OPENSSL=@SYSTEM_OPENSSL@ export SYSTEM_PAGEMAKER=@SYSTEM_PAGEMAKER@ export SYSTEM_POPPLER=@SYSTEM_POPPLER@ export SYSTEM_POSTGRESQL=@SYSTEM_POSTGRESQL@ diff --git a/configure.ac b/configure.ac index ad8c847ed138af111ec9d123de06ec80b76967a6..f275c29c6d878d4fd28b8fb36d242c7dea64e54c 100644 GIT binary patch delta 34 qcmaEKSmyP5nT8g|7N!>F7M3lnRTn8RX-x=@@Gqa%v5O~Bsa$I`o_X<%I+-_` z87nnNn5scYtdJscS;o79kRl{R*?^F`V9TOZU4%^+AcXiV*rM{r9=nj5E#8cE-@E6Y zd)__wm&3{Xwll^kMH)m+TWVm)G`KLlf5bikcYoy~khm2H!3XF4LAaM;<*R{HA zwM>T$va!OGZW2$ku06~PK_|wHk9ojpgA6!9=3Vw=+dHVuRXyqGzkV#%y^D2i8#&l^ zQ1m&G*in>5(GqsDLOzOk@{eGd%KT_FZ%GYetmv&Mx-zKk>N+z+Q6YSi8x8ax5~jZ5 zPQb|behv;}Oi<}_Zee?nC|njc3mg4sPH$GW3WGDR0Wr5y%&ZFON8-ixtdNfKI-MEB z>plITbCVhCDsigc^$;cC^&|EfIEXTXp#$G_H&?jW^0a2idQ-vZRWEDaR;9SQT%)R22ZUX9dLUwM^9>{u!@<{_ zr4W3V54`xiLFQ1urb7rKx)MhvOviCKjS}(2_{;HH%&k7*%R%P>Hw8}@eWCU-hxDZD zmYhbrl4a0|mmDPNj!K#h^f zDKfR0GrYcRVQMy{8Hz@I>3DpwAyb02-Uv&I(iYt&U7JSxl>S#nvxd^66b)@_p%B$b z*vblyWXR2=vk+0$Ya@X{abbnJ~4eESo^{s z9v_MV=9m7+{x>8D8*|L5{on6IUZ8uylggbvY`AMv9LfRy*kU3dp71}l|Kpw0Fm=Sf z0+kwFs0STpG*6f2U~oLj-K}Uj`g{*9uF^V%Qg>J9)-SFVDt#}D*-Y+2p_GTtDl--t yT3dk!_qj8X|H%9L&%g|nf1=y`;B7WIG5l5yl8Czu)${D*@7++jTQ}5zdiXbCs}gkp diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 6927bbe457e..c2606515fa8 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -46,7 +46,6 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\ boost_headers \ postgresql \ $(if $(filter-out MSC,$(COM)), \ - openssl \ $(if $(ENABLE_LDAP),openldap) \ nss3 \ plc4 \ diff --git a/external/Module_external.mk b/external/Module_external.mk index e9d53ee5ab7..719c8b18794 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -78,7 +78,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,NSS,nss) \ $(call gb_Helper_optional,ODFGEN,libodfgen) \ $(call gb_Helper_optional,OPENLDAP,openldap) \ - $(call gb_Helper_optional,OPENSSL,openssl) \ $(call gb_Helper_optional,ORCUS,liborcus) \ $(call gb_Helper_optional,OWNCLOUD_ANDROID_LIB,owncloud-android-lib) \ $(call gb_Helper_optional,PAGEMAKER,libpagemaker) \ diff --git a/oox/CppunitTest_oox_tokenmap.mk b/oox/CppunitTest_oox_tokenmap.mk index 8019da7a230..0c6ab952a81 100644 --- a/oox/CppunitTest_oox_tokenmap.mk +++ b/oox/CppunitTest_oox_tokenmap.mk @@ -20,19 +20,10 @@ $(eval $(call gb_CppunitTest_use_sdk_api,oox_tokenmap)) $(eval $(call gb_CppunitTest_use_library_objects,oox_tokenmap,oox)) -ifeq ($(TLS),OPENSSL) -$(eval $(call gb_CppunitTest_use_externals,oox_tokenmap,\ - openssl \ - openssl_headers \ -)) -else -ifeq ($(TLS),NSS) $(eval $(call gb_CppunitTest_use_externals,oox_tokenmap,\ plc4 \ nss3 \ )) -endif -endif $(eval $(call gb_CppunitTest_use_libraries,oox_tokenmap,\ avmedia \ diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 2d4718a320c..8ca44f2def6 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -67,19 +67,10 @@ $(eval $(call gb_Library_use_externals,oox,\ boost_headers \ )) -ifeq ($(TLS),OPENSSL) -$(eval $(call gb_Library_use_externals,oox,\ - openssl \ - openssl_headers \ -)) -else -ifeq ($(TLS),NSS) $(eval $(call gb_Library_use_externals,oox,\ plc4 \ nss3 \ )) -endif -endif $(eval $(call gb_Library_set_componentfile,oox,oox/util/oox)) diff --git a/ucb/CppunitTest_ucb_webdav_local_neon.mk b/ucb/CppunitTest_ucb_webdav_local_neon.mk index 2e920f4ca03..a4ea2358d2f 100644 --- a/ucb/CppunitTest_ucb_webdav_local_neon.mk +++ b/ucb/CppunitTest_ucb_webdav_local_neon.mk @@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_local_neon,\ boost_headers \ libxml2 \ neon \ - openssl \ )) $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_local_neon,\ diff --git a/ucb/CppunitTest_ucb_webdav_neon_opts.mk b/ucb/CppunitTest_ucb_webdav_neon_opts.mk index df670ed7afd..020d9f9b6dd 100644 --- a/ucb/CppunitTest_ucb_webdav_neon_opts.mk +++ b/ucb/CppunitTest_ucb_webdav_neon_opts.mk @@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_neon_opts,\ boost_headers \ libxml2 \ neon \ - openssl \ )) $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_neon_opts,\ diff --git a/ucb/CppunitTest_ucb_webdav_propfindcache.mk b/ucb/CppunitTest_ucb_webdav_propfindcache.mk index 8d4a12d32ad..8504a0200ae 100644 --- a/ucb/CppunitTest_ucb_webdav_propfindcache.mk +++ b/ucb/CppunitTest_ucb_webdav_propfindcache.mk @@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_propfindcache,\ boost_headers \ libxml2 \ neon \ - openssl \ )) $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_propfindcache,\ diff --git a/ucb/CppunitTest_ucb_webdav_res_access.mk b/ucb/CppunitTest_ucb_webdav_res_access.mk index fa0669987bd..ad25d29f945 100644 --- a/ucb/CppunitTest_ucb_webdav_res_access.mk +++ b/ucb/CppunitTest_ucb_webdav_res_access.mk @@ -35,7 +35,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_res_access,\ boost_headers \ libxml2 \ neon \ - openssl \ )) $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_res_access,\ diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index c76489bd484..2496b80c769 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\ boost_headers \ libxml2 \ neon \ - openssl \ )) $(eval $(call gb_Library_use_custom_headers,ucpdav1,\ @@ -73,7 +72,6 @@ else # WITH_WEBDAV == serf $(eval $(call gb_Library_use_externals,ucpdav1,\ boost_headers \ apr \ - openssl \ serf \ zlib \ )) -- 2.30.2